Correct merge

diff --git a/src/alloc.c b/src/alloc.c
index 15bfbbbb1b73b67cefa4a2983385ec0452874c4f..b2b159a79528fc081705244362abc2c17704dcdf 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6895,14 +6895,14 @@ note_suspicious_free (void* ptr)
 
   rec = &suspicious_free_history[suspicious_free_history_index++];
   if (suspicious_free_history_index ==
-      EARRAYSIZE (suspicious_free_history))
+      ARRAYELTS (suspicious_free_history))
     {
       suspicious_free_history_index = 0;
     }
 
   memset (rec, 0, sizeof (*rec));
   rec->suspicious_object = ptr;
-  backtrace (&rec->backtrace[0], EARRAYSIZE (rec->backtrace));
+  backtrace (&rec->backtrace[0], ARRAYELTS (rec->backtrace));
 }
 
 static void